From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 13 Jun 1993 01:57:02 +0000 (+0000)
Subject: (abbreviate-file-name): Match home dir with no / if nothing else follows.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95351
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3a8a836d28ba26ce78d1d672d8657f9c080ef36b;p=emacs.git

(abbreviate-file-name): Match home dir with no / if nothing else follows.
---

diff --git a/lisp/files.el b/lisp/files.el
index 688b71b5bd4..dc07a02473a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -520,7 +520,9 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information."
     (or abbreviated-home-dir
 	(setq abbreviated-home-dir
 	      (let ((abbreviated-home-dir "$foo"))
-		(concat "^" (abbreviate-file-name (expand-file-name "~/"))))))
+		(concat "^" (abbreviate-file-name (expand-file-name "~"))
+			"\\(/\\|$\\)"))))
+						  
     ;; If FILENAME starts with the abbreviated homedir,
     ;; make it start with `~' instead.
     (if (string-match abbreviated-home-dir filename)
@@ -536,6 +538,7 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information."
 				       (1- (length abbreviated-home-dir))))
 			  "/"
 			"")
+		      (substring filename (match-beginning 1) (match-end 1))
 		      (substring filename (match-end 0)))))
     filename))